Scattered code arrangement cleanups.

- remove redundant declarations
- add/move prototypes to headers
- move things where they belong to

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>

diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c
index f966be21db1ebcabfa47751c8d1d3b40cab9e65d..121d1bae4c62f41f1368f734d8b8498e526af176 100644 (file)
--- a/xen/arch/x86/acpi/boot.c
+++ b/xen/arch/x86/acpi/boot.c
@@ -37,6 +37,9 @@
 #include <asm/io.h>
 #include <asm/mpspec.h>
 #include <asm/processor.h>
+#ifdef CONFIG_HPET_TIMER
+#include <asm/hpet.h> /* for hpet_address */
+#endif
 #include <mach_apic.h>
 #include <mach_mpparse.h>
 
@@ -317,8 +320,6 @@ static int __init acpi_parse_hpet(struct acpi_table_header *table)
               hpet_tbl->id, vxtime.hpet_address);
 #else  /* X86 */
        {
-               extern unsigned long hpet_address;
-
                hpet_address = hpet_tbl->address.address;
                printk(KERN_INFO PREFIX "HPET id: %#x base: %#lx\n",
                       hpet_tbl->id, hpet_address);
@@ -898,8 +899,6 @@ int __init acpi_boot_table_init(void)
         */
        error = acpi_blacklisted();
        if (error) {
-               extern int acpi_force;
-
                if (acpi_force) {
                        printk(KERN_WARNING PREFIX "acpi=force override\n");
                } else {

diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c
index 379ca5526fd7ab6a88e22bef67638b9a1bddd50e..61f294f7bccdd55a01570e00df983f1e2a77cf09 100644 (file)
--- a/xen/arch/x86/acpi/cpu_idle.c
+++ b/xen/arch/x86/acpi/cpu_idle.c
@@ -45,6 +45,7 @@
 #include <asm/io.h>
 #include <asm/hpet.h>
 #include <asm/processor.h>
+#include <xen/pmstat.h>
 #include <public/platform.h>
 #include <public/sysctl.h>
 #include <acpi/cpufreq/cpufreq.h>

diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c
index cfcd621a044ed6650a561b508ce244088c0441e6..b9004413a89330a780ebee9c7699e3e00f275b6d 100644 (file)
--- a/xen/arch/x86/apic.c
+++ b/xen/arch/x86/apic.c
@@ -34,9 +34,29 @@
 #include <asm/hardirq.h>
 #include <asm/apic.h>
 #include <asm/io_apic.h>
+#include <asm/asm_defns.h> /* for BUILD_SMP_INTERRUPT */
 #include <mach_apic.h>
 #include <io_ports.h>
 
+static struct {
+    int active;
+    /* r/w apic fields */
+    unsigned int apic_id;
+    unsigned int apic_taskpri;
+    unsigned int apic_ldr;
+    unsigned int apic_dfr;
+    unsigned int apic_spiv;
+    unsigned int apic_lvtt;
+    unsigned int apic_lvtpc;
+    unsigned int apic_lvtcmci;
+    unsigned int apic_lvt0;
+    unsigned int apic_lvt1;
+    unsigned int apic_lvterr;
+    unsigned int apic_tmict;
+    unsigned int apic_tdcr;
+    unsigned int apic_thmr;
+} apic_pm_state;
+
 /*
  * Knob to control our willingness to enable the local APIC.
  */
@@ -49,8 +69,31 @@ int apic_verbosity;
 
 int x2apic_enabled __read_mostly = 0;
 
+/*
+ * The following vectors are part of the Linux architecture, there
+ * is no hardware IRQ pin equivalent for them, they are triggered
+ * through the ICC by us (IPIs)
+ */
+BUILD_SMP_INTERRUPT(irq_move_cleanup_interrupt,IRQ_MOVE_CLEANUP_VECTOR)
+BUILD_SMP_INTERRUPT(event_check_interrupt,EVENT_CHECK_VECTOR)
+BUILD_SMP_INTERRUPT(invalidate_interrupt,INVALIDATE_TLB_VECTOR)
+BUILD_SMP_INTERRUPT(call_function_interrupt,CALL_FUNCTION_VECTOR)
 
-static void apic_pm_activate(void);
+/*
+ * Every pentium local APIC has two 'local interrupts', with a
+ * soft-definable vector attached to both interrupts, one of
+ * which is a timer interrupt, the other one is error counter
+ * overflow. Linux uses the local APIC timer interrupt to get
+ * a much simpler SMP time architecture:
+ */
+BUILD_SMP_INTERRUPT(apic_timer_interrupt,LOCAL_TIMER_VECTOR)
+BUILD_SMP_INTERRUPT(error_interrupt,ERROR_APIC_VECTOR)
+BUILD_SMP_INTERRUPT(spurious_interrupt,SPURIOUS_APIC_VECTOR)
+BUILD_SMP_INTERRUPT(pmu_apic_interrupt,PMU_APIC_VECTOR)
+BUILD_SMP_INTERRUPT(cmci_interrupt, CMCI_APIC_VECTOR)
+#ifdef CONFIG_X86_MCE_THERMAL
+BUILD_SMP_INTERRUPT(thermal_interrupt,THERMAL_APIC_VECTOR)
+#endif
 
 static int modern_apic(void)
 {
@@ -428,6 +471,11 @@ void __init init_bsp_APIC(void)
     apic_write_around(APIC_LVT1, value);
 }
 
+static void apic_pm_activate(void)
+{
+    apic_pm_state.active = 1;
+}
+
 void __devinit setup_local_APIC(void)
 {
     unsigned long oldvalue, value, ver, maxlvt;
@@ -598,25 +646,6 @@ void __devinit setup_local_APIC(void)
     apic_pm_activate();
 }
 
-static struct {
-    int active;
-    /* r/w apic fields */
-    unsigned int apic_id;
-    unsigned int apic_taskpri;
-    unsigned int apic_ldr;
-    unsigned int apic_dfr;
-    unsigned int apic_spiv;
-    unsigned int apic_lvtt;
-    unsigned int apic_lvtpc;
-    unsigned int apic_lvtcmci;
-    unsigned int apic_lvt0;
-    unsigned int apic_lvt1;
-    unsigned int apic_lvterr;
-    unsigned int apic_tmict;
-    unsigned int apic_tdcr;
-    unsigned int apic_thmr;
-} apic_pm_state;
-
 int lapic_suspend(void)
 {
     unsigned long flags;
@@ -728,11 +757,6 @@ void lapic_shutdown(void)
     local_irq_restore(flags);
 }
 
-static void apic_pm_activate(void)
-{
-    apic_pm_state.active = 1;
-}
-
 /*
  * Detect and enable local APICs on non-SMP boards.
  * Original code written by Keir Fraser.

diff --git a/xen/arch/x86/bzimage.c b/xen/arch/x86/bzimage.c
index 484367791697f102365c6f0690b2f3327c138eae..6408d886139577e32fe64bc825e79ae5db69818d 100644 (file)
--- a/xen/arch/x86/bzimage.c
+++ b/xen/arch/x86/bzimage.c
@@ -4,6 +4,7 @@
 #include <xen/mm.h>
 #include <xen/string.h>
 #include <xen/types.h>
+#include <asm/bzimage.h>
 
 #define HEAPORDER 3
 

diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c
index 155bc37ad5f00cef0fdbfa8ab4054d721589ae1c..d7d3fe7cd7362917b255aea98429d1fbbea684ba 100644 (file)
--- a/xen/arch/x86/cpu/amd.c
+++ b/xen/arch/x86/cpu/amd.c
@@ -8,6 +8,7 @@
 #include <asm/msr.h>
 #include <asm/processor.h>
 #include <asm/hvm/support.h>
+#include <asm/setup.h> /* amd_init_cpu */
 
 #include "cpu.h"
 #include "amd.h"

diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c
index d13e7e2e5561b6093706004896633d6836b871c8..b1bf52171271288b3cc9c0ad34ed7a0a3a858154 100644 (file)
--- a/xen/arch/x86/cpu/common.c
+++ b/xen/arch/x86/cpu/common.c
@@ -11,6 +11,7 @@
 #include <asm/mpspec.h>
 #include <asm/apic.h>
 #include <mach_apic.h>
+#include <asm/setup.h>
 
 #include "cpu.h"
 
@@ -546,13 +547,6 @@ cpumask_t cpu_initialized __cpuinitdata = CPU_MASK_NONE;
  * Then, when cpu_init() is called, we can just iterate over that array.
  */
 
-extern int intel_cpu_init(void);
-extern int cyrix_init_cpu(void);
-extern int nsc_init_cpu(void);
-extern int amd_init_cpu(void);
-extern int centaur_init_cpu(void);
-extern int transmeta_init_cpu(void);
-
 void __init early_cpu_init(void)
 {
        intel_cpu_init();

diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c
index ccf19201b7f77260451e43504542a871012c2328..5df0ec198fd8d21586687ec361a9fe40b8a1911a 100644 (file)
--- a/xen/arch/x86/cpu/intel.c
+++ b/xen/arch/x86/cpu/intel.c
@@ -12,6 +12,7 @@
 #include <asm/i387.h>
 #include <mach_apic.h>
 #include <asm/hvm/support.h>
+#include <asm/setup.h>
 
 #include "cpu.h"
 
@@ -296,7 +297,7 @@ static struct cpu_dev intel_cpu_dev __devinitdata = {
        .c_size_cache   = intel_size_cache,
 };
 
-__init int intel_cpu_init(void)
+int __init intel_cpu_init(void)
 {
        cpu_devs[X86_VENDOR_INTEL] = &intel_cpu_dev;
        return 0;

diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c
index 8cdbdac8729f63b8c7bad60f4e3119a156adff9e..8bb33aacb5fc1fe3005ca2176d11a6ae02e1a8d7 100644 (file)
--- a/xen/arch/x86/cpu/mcheck/mce.c
+++ b/xen/arch/x86/cpu/mcheck/mce.c
@@ -15,6 +15,7 @@
 #include <xen/cpumask.h>
 #include <xen/event.h>
 #include <xen/guest_access.h>
+#include <xen/hypercall.h> /* for do_mca */
 
 #include <asm/processor.h>
 #include <asm/system.h>

diff --git a/xen/arch/x86/cpu/mtrr/generic.c b/xen/arch/x86/cpu/mtrr/generic.c
index 3df53a2f8efe491e90bb0cbd98c8fc47cc8720d4..534eca855ff1427b356e558fd780f0d66cc5ec3f 100644 (file)
--- a/xen/arch/x86/cpu/mtrr/generic.c
+++ b/xen/arch/x86/cpu/mtrr/generic.c
@@ -102,7 +102,6 @@ void __init mtrr_state_warn(void)
        printk(KERN_INFO "mtrr: corrected configuration.\n");
 }
 
-extern bool_t is_var_mtrr_overlapped(struct mtrr_state *m);
 /* Doesn't attempt to pass an error out to MTRR users
    because it's quite complicated in some cases and probably not
    worth it because the best error handling is to ignore it. */

diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c
index ecc2f1f9385f26a0785493ca940a02d8347a083f..06a285f231ecdb3c27fc32ca703f14cc0b6f8338 100644 (file)
--- a/xen/arch/x86/domain_build.c
+++ b/xen/arch/x86/domain_build.c
@@ -29,15 +29,10 @@
 #include <asm/paging.h>
 #include <asm/p2m.h>
 #include <asm/e820.h>
+#include <asm/bzimage.h> /* for bzimage_parse */
 
 #include <public/version.h>
 
-int __init bzimage_parse(
-    char *output, char **image_start, unsigned long *image_len);
-
-extern unsigned long initial_images_nrpages(void);
-extern void discard_initial_images(void);
-
 static long __initdata dom0_nrpages;
 static long __initdata dom0_min_nrpages;
 static long __initdata dom0_max_nrpages = LONG_MAX;

diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c
index c5684c9a228907676bd940fe67b39fbada32420a..6025475a307685a5e5f455035082d8397f442511 100644 (file)
--- a/xen/arch/x86/domctl.c
+++ b/xen/arch/x86/domctl.c
@@ -26,6 +26,8 @@
 #include <asm/hvm/support.h>
 #include <asm/hvm/cacheattr.h>
 #include <asm/processor.h>
+#include <asm/acpi.h> /* for hvm_acpi_power_button */
+#include <asm/hypercall.h> /* for arch_do_domctl */
 #include <xsm/xsm.h>
 #include <xen/iommu.h>
 
@@ -590,8 +592,6 @@ long arch_do_domctl(
 
         case XEN_DOMCTL_SENDTRIGGER_POWER:
         {
-            extern void hvm_acpi_power_button(struct domain *d);
-
             ret = -EINVAL;
             if ( is_hvm_domain(d) ) 
             {

diff --git a/xen/arch/x86/genapic/probe.c b/xen/arch/x86/genapic/probe.c
index eaf1df24c783cfebd4dc906d67e8300a47f8686d..22384d2207ca14965219c08e3e2b00f8cea8dcce 100644 (file)
--- a/xen/arch/x86/genapic/probe.c
+++ b/xen/arch/x86/genapic/probe.c
@@ -12,7 +12,8 @@
 #include <asm/fixmap.h>
 #include <asm/mpspec.h>
 #include <asm/apicdef.h>
-#include <asm/genapic.h>
+#include <asm/mach-generic/mach_apic.h>
+#include <asm/setup.h>
 
 extern struct genapic apic_summit;
 extern struct genapic apic_bigsmp;

diff --git a/xen/arch/x86/hpet.c b/xen/arch/x86/hpet.c
index 3a560f11fc97d1c33b2362eb88bf5c1cfd83e472..1090f2dd5954766f67a9aee73550ca9b25b97a82 100644 (file)
--- a/xen/arch/x86/hpet.c
+++ b/xen/arch/x86/hpet.c
@@ -16,6 +16,7 @@
 #include <asm/hpet.h>
 #include <asm/msi.h>
 #include <mach_apic.h>
+#include <xen/cpuidle.h>
 
 #define MAX_DELTA_NS MILLISECS(10*1000)
 #define MIN_DELTA_NS MICROSECS(20)
@@ -53,8 +54,6 @@ static int *irq_channel;
 
 unsigned long hpet_address;
 
-void msi_compose_msg(struct pci_dev *pdev, int irq, struct msi_msg *msg);
-
 /*
  * force_hpet_broadcast: by default legacy hpet broadcast will be stopped
  * if RTC interrupts are enabled. Enable this option if want to always enable
@@ -491,7 +490,6 @@ static void (*hpet_attach_channel)(int cpu, struct hpet_event_channel *ch);
 static void (*hpet_detach_channel)(int cpu);
 
 #include <asm/mc146818rtc.h>
-void cpuidle_disable_deep_cstate(void);
 
 void (*pv_rtc_handler)(unsigned int port, uint8_t value);
 

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index c6b28d53462ede1698f7490f8be61854c0048073..03798827d0e391c43bf82ef9e2b6aa9fa3c6d4d2 100644 (file)
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -52,6 +52,7 @@
 #include <asm/hvm/support.h>
 #include <asm/hvm/cacheattr.h>
 #include <asm/hvm/trace.h>
+#include <asm/mtrr.h>
 #include <public/sched.h>
 #include <public/hvm/ioreq.h>
 #include <public/version.h>
@@ -950,7 +951,6 @@ int hvm_set_efer(uint64_t value)
 }
 
 extern void shadow_blow_tables_per_domain(struct domain *d);
-extern bool_t mtrr_pat_not_equal(struct vcpu *vd, struct vcpu *vs);
 
 /* Exit UC mode only if all VCPUs agree on MTRR/PAT and are not in no_fill. */
 static bool_t domain_exit_uc_mode(struct vcpu *v)
@@ -1964,13 +1964,6 @@ gp_fault:
 
 int hvm_msr_write_intercept(struct cpu_user_regs *regs)
 {
-    extern bool_t mtrr_var_range_msr_set(
-        struct mtrr_state *v, u32 msr, u64 msr_content);
-    extern bool_t mtrr_fix_range_msr_set(
-        struct mtrr_state *v, int row, u64 msr_content);
-    extern bool_t mtrr_def_type_msr_set(struct mtrr_state *v, u64 msr_content);
-    extern bool_t pat_msr_set(u64 *pat, u64 msr);
-
     uint32_t ecx = regs->ecx;
     uint64_t msr_content = (uint32_t)regs->eax | ((uint64_t)regs->edx << 32);
     struct vcpu *v = current;

diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c
index 5ed0be1780bab423d045528f591a297a07e64e59..8433092a4fb36ad9af79dc7029f9130945fd6a04 100644 (file)
--- a/xen/arch/x86/hvm/mtrr.c
+++ b/xen/arch/x86/hvm/mtrr.c
@@ -147,14 +147,9 @@ bool_t is_var_mtrr_overlapped(struct mtrr_state *m)
 
 #define MTRRphysBase_MSR(reg) (0x200 + 2 * (reg))
 #define MTRRphysMask_MSR(reg) (0x200 + 2 * (reg) + 1)
-bool_t mtrr_var_range_msr_set(struct mtrr_state *m, uint32_t msr,
-                              uint64_t msr_content);
-bool_t mtrr_fix_range_msr_set(struct mtrr_state *m, uint32_t row,
-                              uint64_t msr_content);
 
 static int hvm_mtrr_pat_init(void)
 {
-    extern uint64_t host_pat;
     unsigned int i, j, phys_addr;
 
     memset(&mtrr_epat_tbl, INVALID_MEM_TYPE, sizeof(mtrr_epat_tbl));

diff --git a/xen/arch/x86/hvm/pmtimer.c b/xen/arch/x86/hvm/pmtimer.c
index 276538f0285683957ace88b4c293ba4f61372f10..0a0b326efe77099cbf9f5d58680b9f304807014b 100644 (file)
--- a/xen/arch/x86/hvm/pmtimer.c
+++ b/xen/arch/x86/hvm/pmtimer.c
@@ -21,6 +21,7 @@
 #include <asm/hvm/vpt.h>
 #include <asm/hvm/io.h>
 #include <asm/hvm/support.h>
+#include <asm/acpi.h> /* for hvm_acpi_power_button prototype */
 
 /* Slightly more readable port I/O addresses for the registers we intercept */
 #define PM1a_STS_ADDR (ACPI_PM1A_EVT_BLK_ADDRESS)

diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c
index fc630fd5d9f845534a9b6b332e8094220fb0ca26..dde588db2f7706ba2eeeed52a8c82f7bfb27d09a 100644 (file)
--- a/xen/arch/x86/hvm/svm/svm.c
+++ b/xen/arch/x86/hvm/svm/svm.c
@@ -61,8 +61,6 @@ static struct hvm_function_table svm_function_table;
 
 enum handler_return { HNDL_done, HNDL_unhandled, HNDL_exception_raised };
 
-asmlinkage void do_IRQ(struct cpu_user_regs *);
-
 /* va of hardware host save area     */
 static void *hsa[NR_CPUS] __read_mostly;
 

diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c
index 242a8933c0fdc10f35db8b92d18d9e629dc9ebad..3559d8a96113eb806f2a00a37adcb160630bdb96 100644 (file)
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -2087,20 +2087,6 @@ static void vmx_do_extint(struct cpu_user_regs *regs)
 {
     unsigned int vector;
 
-    asmlinkage void do_IRQ(struct cpu_user_regs *);
-    fastcall void smp_apic_timer_interrupt(struct cpu_user_regs *);
-    fastcall void smp_event_check_interrupt(struct cpu_user_regs *regs);
-    fastcall void smp_invalidate_interrupt(void);
-    fastcall void smp_call_function_interrupt(struct cpu_user_regs *regs);
-    fastcall void smp_spurious_interrupt(struct cpu_user_regs *regs);
-    fastcall void smp_error_interrupt(struct cpu_user_regs *regs);
-    fastcall void smp_pmu_apic_interrupt(struct cpu_user_regs *regs);
-    fastcall void smp_cmci_interrupt(struct cpu_user_regs *regs);
-    fastcall void smp_irq_move_cleanup_interrupt(struct cpu_user_regs *regs);
-#ifdef CONFIG_X86_MCE_THERMAL
-    fastcall void smp_thermal_interrupt(struct cpu_user_regs *regs);
-#endif
-
     vector = __vmread(VM_EXIT_INTR_INFO);
     BUG_ON(!(vector & INTR_INFO_VALID_MASK));
 

diff --git a/xen/arch/x86/i8259.c b/xen/arch/x86/i8259.c
index 79811204134dda99c5961c0fc45b84317d755e01..a44dd068aea40920fe0124287719b1d30e300d6b 100644 (file)
--- a/xen/arch/x86/i8259.c
+++ b/xen/arch/x86/i8259.c
@@ -53,30 +53,6 @@ BUILD_16_IRQS(0xc) BUILD_16_IRQS(0xd) BUILD_16_IRQS(0xe) BUILD_16_IRQS(0xf)
 #undef BI
 
 
-/*
- * The following vectors are part of the Linux architecture, there
- * is no hardware IRQ pin equivalent for them, they are triggered
- * through the ICC by us (IPIs)
- */
-BUILD_SMP_INTERRUPT(irq_move_cleanup_interrupt,IRQ_MOVE_CLEANUP_VECTOR)
-BUILD_SMP_INTERRUPT(event_check_interrupt,EVENT_CHECK_VECTOR)
-BUILD_SMP_INTERRUPT(invalidate_interrupt,INVALIDATE_TLB_VECTOR)
-BUILD_SMP_INTERRUPT(call_function_interrupt,CALL_FUNCTION_VECTOR)
-
-/*
- * Every pentium local APIC has two 'local interrupts', with a
- * soft-definable vector attached to both interrupts, one of
- * which is a timer interrupt, the other one is error counter
- * overflow. Linux uses the local APIC timer interrupt to get
- * a much simpler SMP time architecture:
- */
-BUILD_SMP_INTERRUPT(apic_timer_interrupt,LOCAL_TIMER_VECTOR)
-BUILD_SMP_INTERRUPT(error_interrupt,ERROR_APIC_VECTOR)
-BUILD_SMP_INTERRUPT(spurious_interrupt,SPURIOUS_APIC_VECTOR)
-BUILD_SMP_INTERRUPT(pmu_apic_interrupt,PMU_APIC_VECTOR)
-BUILD_SMP_INTERRUPT(thermal_interrupt,THERMAL_APIC_VECTOR)
-BUILD_SMP_INTERRUPT(cmci_interrupt, CMCI_APIC_VECTOR)
-
 #define IRQ(x,y) \
     IRQ##x##y##_interrupt
 

diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index c34b1a2df34739dc40c46bf3224fac82c57bb6e3..96a3db147213b8663ce40502751584e1a3bc9530 100644 (file)
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -113,6 +113,7 @@
 #include <public/sched.h>
 #include <xsm/xsm.h>
 #include <xen/trace.h>
+#include <asm/setup.h>
 
 /*
  * Mapping of first 2 or 4 megabytes of memory. This is mapped with 4kB
@@ -222,8 +223,6 @@ void __init init_frametable(void)
 
 void __init arch_init_memory(void)
 {
-    extern void subarch_init_memory(void);
-
     unsigned long i, pfn, rstart_pfn, rend_pfn, iostart_pfn, ioend_pfn;
 
     /*
@@ -4484,8 +4483,6 @@ int ptwr_do_page_fault(struct vcpu *v, unsigned long addr,
 
 void free_xen_pagetable(void *v)
 {
-    extern int early_boot;
-
     if ( early_boot )
         return;
 

diff --git a/xen/arch/x86/mm/shadow/multi.h b/xen/arch/x86/mm/shadow/multi.h
index e40eee77d82b478c68f3a63259241489758eaaeb..c400fcec2a7f593c2c6c34fd6c0f04869bbdf22c 100644 (file)
--- a/xen/arch/x86/mm/shadow/multi.h
+++ b/xen/arch/x86/mm/shadow/multi.h
@@ -100,10 +100,10 @@ SHADOW_INTERNAL_NAME(sh_audit_l4_table, GUEST_LEVELS)
 #endif
 
 extern void *
-SHADOW_INTERNAL_NAME(sh_guest_map_l1e, CONFIG_PAGING_LEVELS)
+SHADOW_INTERNAL_NAME(sh_guest_map_l1e, GUEST_LEVELS)
     (struct vcpu *v, unsigned long va, unsigned long *gl1mfn);
 extern void
-SHADOW_INTERNAL_NAME(sh_guest_get_eff_l1e, CONFIG_PAGING_LEVELS)
+SHADOW_INTERNAL_NAME(sh_guest_get_eff_l1e, GUEST_LEVELS)
     (struct vcpu *v, unsigned long va, void *eff_l1e);
 
 extern mfn_t

diff --git a/xen/arch/x86/oprofile/nmi_int.c b/xen/arch/x86/oprofile/nmi_int.c
index 07050457f3212d2d04096f8f610275420731a8c5..e827e90e1ea537def8fde4820fa136b2588b5239 100644 (file)
--- a/xen/arch/x86/oprofile/nmi_int.c
+++ b/xen/arch/x86/oprofile/nmi_int.c
@@ -35,9 +35,6 @@ static unsigned long saved_lvtpc[NR_CPUS];
 
 static char *cpu_type;
 
-extern int is_active(struct domain *d);
-extern int is_passive(struct domain *d);
-
 static int passive_domain_msr_op_checks(struct cpu_user_regs *regs ,int *typep, int *indexp)
 {
        struct vpmu_struct *vpmu = vcpu_vpmu(current);

diff --git a/xen/arch/x86/oprofile/op_model_athlon.c b/xen/arch/x86/oprofile/op_model_athlon.c
index 14f8f83460d431e558073982905436b842ce61d0..bd7ee36cfa6a28272dc40fe981c63532c05254b6 100644 (file)
--- a/xen/arch/x86/oprofile/op_model_athlon.c
+++ b/xen/arch/x86/oprofile/op_model_athlon.c
@@ -46,11 +46,6 @@
 
 static unsigned long reset_value[NUM_COUNTERS];
 
-extern void xenoprof_log_event(struct vcpu *v, struct cpu_user_regs * regs, 
-                              unsigned long eip, int mode, int event);
-extern int xenoprofile_get_mode(struct vcpu *v,
-                               struct cpu_user_regs * const regs);
-
 extern char svm_stgi_label[];
 
 static void athlon_fill_in_addresses(struct op_msrs * const msrs)

diff --git a/xen/arch/x86/oprofile/op_model_p4.c b/xen/arch/x86/oprofile/op_model_p4.c
index c3ea7a7074c18d23c3485519193ec6341f977366..54404fc8608846bb386fd0c8fcf8c6534d31e08f 100644 (file)
--- a/xen/arch/x86/oprofile/op_model_p4.c
+++ b/xen/arch/x86/oprofile/op_model_p4.c
@@ -620,11 +620,6 @@ static void p4_setup_ctrs(struct op_msrs const * const msrs)
        }
 }
 
-extern void xenoprof_log_event(struct vcpu *v, struct cpu_user_regs * regs, 
-                              unsigned long eip, int mode, int event);
-extern int xenoprofile_get_mode(struct vcpu *v,
-                               struct cpu_user_regs * const regs);
-
 static int p4_check_ctrs(unsigned int const cpu,
                          struct op_msrs const * const msrs,
                          struct cpu_user_regs * const regs)

diff --git a/xen/arch/x86/oprofile/op_model_ppro.c b/xen/arch/x86/oprofile/op_model_ppro.c
index 0bd90ec2ff36e33582facd9660c75cd537b8c352..1e50345e9fc3203ede38882864398926c15ff72a 100644 (file)
--- a/xen/arch/x86/oprofile/op_model_ppro.c
+++ b/xen/arch/x86/oprofile/op_model_ppro.c
@@ -57,7 +57,6 @@ static int counter_width = 32;
 #define IS_ENABLE(val) (val & (1 << 20) )
 static unsigned long reset_value[OP_MAX_COUNTER];
 int ppro_has_global_ctrl = 0;
-extern int is_passive(struct domain *d);
  
 static void ppro_fill_in_addresses(struct op_msrs * const msrs)
 {
@@ -124,11 +123,6 @@ static void ppro_setup_ctrs(struct op_msrs const * const msrs)
        }
 }
 
-extern void xenoprof_log_event(struct vcpu *v, struct cpu_user_regs * regs, 
-                              unsigned long eip, int mode, int event);
-extern int xenoprofile_get_mode(struct vcpu *v,
-                               struct cpu_user_regs * const regs);
- 
 static int ppro_check_ctrs(unsigned int const cpu,
                            struct op_msrs const * const msrs,
                            struct cpu_user_regs * const regs)

diff --git a/xen/arch/x86/pci.c b/xen/arch/x86/pci.c
index ea2cef983246eb4bade7d2b50497754868459e8f..88e926dfa2ac64ee0da52ed5f8a656ce17ae9eae 100644 (file)
--- a/xen/arch/x86/pci.c
+++ b/xen/arch/x86/pci.c
@@ -5,6 +5,7 @@
  */
 
 #include <xen/spinlock.h>
+#include <xen/pci.h>
 #include <asm/io.h>
 
 static DEFINE_SPINLOCK(pci_config_lock);

diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index 8b56868ca265a715391eab1fff1f38e9958fc4e2..80a57d6dcf7b5ddbe0818f583e8d6dc6a9b3680d 100644 (file)
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -38,8 +38,9 @@
 #include <asm/edd.h>
 #include <xsm/xsm.h>
 #include <asm/tboot.h>
-
-int __init bzimage_headroom(char *image_start, unsigned long image_length);
+#include <asm/bzimage.h> /* for bzimage_headroom */
+#include <asm/mach-generic/mach_apic.h> /* for generic_apic_probe */
+#include <asm/setup.h>
 
 #if defined(CONFIG_X86_64)
 #define BOOTSTRAP_DIRECTMAP_END (1UL << 32) /* 4GB */
@@ -49,9 +50,6 @@ int __init bzimage_headroom(char *image_start, unsigned long image_length);
 #define maddr_to_bootstrap_virt(m) ((void *)(long)(m))
 #endif
 
-extern void generic_apic_probe(void);
-extern void numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn);
-
 extern u16 boot_edid_caps;
 extern u8 boot_edid_info[128];
 extern struct boot_video_info boot_vid_info;
@@ -79,12 +77,10 @@ custom_param("acpi", parse_acpi_param);
 
 /* **** Linux config option: propagated to domain0. */
 /* acpi_skip_timer_override: Skip IRQ0 overrides. */
-extern int acpi_skip_timer_override;
 boolean_param("acpi_skip_timer_override", acpi_skip_timer_override);
 
 /* **** Linux config option: propagated to domain0. */
 /* noapic: Disable IOAPIC setup. */
-extern int skip_ioapic_setup;
 boolean_param("noapic", skip_ioapic_setup);
 
 /* **** Linux config option: propagated to domain0. */
@@ -103,14 +99,6 @@ unsigned long xen_phys_start;
 unsigned long xenheap_initial_phys_start, xenheap_phys_end;
 #endif
 
-extern void arch_init_memory(void);
-extern void init_IRQ(void);
-extern void early_time_init(void);
-extern void early_cpu_init(void);
-extern void vesa_init(void);
-extern void vesa_mtrr_init(void);
-extern void init_tmem(void);
-
 DEFINE_PER_CPU_READ_MOSTLY(struct desc_struct *, gdt_table) = boot_cpu_gdt_table;
 #ifdef CONFIG_COMPAT
 DEFINE_PER_CPU_READ_MOSTLY(struct desc_struct *, compat_gdt_table)
@@ -203,7 +191,7 @@ static void free_xen_data(char *s, char *e)
 #endif
 }
 
-extern char __init_begin[], __bss_start[];
+extern char __init_begin[], __init_end[], __bss_start[];
 extern char __per_cpu_start[], __per_cpu_data_end[];
 
 static void __init percpu_init_areas(void)
@@ -390,7 +378,7 @@ static void __init parse_video_info(void)
     }
 }
 
-void __init kexec_reserve_area(struct e820map *e820)
+static void __init kexec_reserve_area(struct e820map *e820)
 {
     unsigned long kdump_start = kexec_crash_area.start;
     unsigned long kdump_size  = kexec_crash_area.size;
@@ -418,8 +406,6 @@ void __init kexec_reserve_area(struct e820map *e820)
 
 void init_done(void)
 {
-    extern char __init_begin[], __init_end[];
-
     /* Free (or page-protect) the init areas. */
     memset(__init_begin, 0xcc, __init_end - __init_begin); /* int3 poison */
     free_xen_data(__init_begin, __init_end);
@@ -457,7 +443,6 @@ void __init __start_xen(unsigned long mbi_p)
         .stop_bits = 1
     };
 
-    extern void early_page_fault(void);
     set_intr_gate(TRAP_page_fault, &early_page_fault);
 
     /* Parse the command-line options. */

diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c
index eaa672d11b9154c9b3b09093148b3209e59ed6e7..5a56b717c98f7969b3f1b36b21496b1aab774833 100644 (file)
--- a/xen/arch/x86/time.c
+++ b/xen/arch/x86/time.c
@@ -31,6 +31,7 @@
 #include <asm/div64.h>
 #include <asm/hpet.h>
 #include <io_ports.h>
+#include <asm/setup.h> /* for early_time_init */
 
 /* opt_clocksource: Force clocksource to one of: pit, hpet, cyclone, acpi. */
 static char __initdata opt_clocksource[10];

diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index 37301feb3a552e0896eea51f960ab513785ea492..325ea451293174a186b8df335e44fd5d9671cbab 100644 (file)
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -111,8 +111,6 @@ DECLARE_TRAP_HANDLER(machine_check);
 DECLARE_TRAP_HANDLER(alignment_check);
 DECLARE_TRAP_HANDLER(spurious_interrupt_bug);
 
-long do_set_debugreg(int reg, unsigned long value);
-unsigned long do_get_debugreg(int reg);
 void (*ioemul_handle_quirk)(
     u8 opcode, char *io_emul_stub, struct cpu_user_regs *regs);
 

diff --git a/xen/arch/x86/x86_32/mm.c b/xen/arch/x86/x86_32/mm.c
index 5c80f0dff3ec682b6f4e1204c8ea001bacccdc4b..cc26a77f2853ed6b2ad9710bd97f2613b4273cf2 100644 (file)
--- a/xen/arch/x86/x86_32/mm.c
+++ b/xen/arch/x86/x86_32/mm.c
@@ -28,6 +28,7 @@
 #include <asm/page.h>
 #include <asm/flushtlb.h>
 #include <asm/fixmap.h>
+#include <asm/setup.h>
 #include <public/memory.h>
 
 l2_pgentry_t __attribute__ ((__section__ (".bss.page_aligned")))
@@ -42,8 +43,6 @@ static unsigned long mpt_size;
 
 void *alloc_xen_pagetable(void)
 {
-    extern int early_boot;
-    extern unsigned long xenheap_initial_phys_start;
     unsigned long mfn;
 
     if ( !early_boot )

diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c
index 87a2a3be32d3436764aa5c0f07015b6cdb981be3..45831bdd1c977a5038127de844c9fd1634aa5c3b 100644 (file)
--- a/xen/arch/x86/x86_64/mm.c
+++ b/xen/arch/x86/x86_64/mm.c
@@ -31,6 +31,7 @@
 #include <asm/fixmap.h>
 #include <asm/hypercall.h>
 #include <asm/msr.h>
+#include <asm/setup.h>
 #include <public/memory.h>
 
 /* Parameters for PFN/MADDR compression. */
@@ -74,7 +75,6 @@ int __mfn_valid(unsigned long mfn)
 
 void *alloc_xen_pagetable(void)
 {
-    extern int early_boot;
     unsigned long mfn;
 
     if ( !early_boot )

diff --git a/xen/arch/x86/x86_64/pci.c b/xen/arch/x86/x86_64/pci.c
index a8a24db3b0cbfb8e7c9429fb30d7187bcf41297f..3fc831402775ca7854454658b22765db6ecd3348 100644 (file)
--- a/xen/arch/x86/x86_64/pci.c
+++ b/xen/arch/x86/x86_64/pci.c
@@ -11,13 +11,6 @@
 #define PCI_CONF_ADDRESS(bus, dev, func, reg) \
     (0x80000000 | (bus << 16) | (dev << 11) | (func << 8) | (reg & ~3))
 
-int pci_mmcfg_read(unsigned int seg, unsigned int bus,
-                   unsigned int devfn, int reg, int len, u32 *value);
-int pci_mmcfg_write(unsigned int seg, unsigned int bus,
-                    unsigned int devfn, int reg, int len, u32 value);
-uint32_t pci_conf_read(uint32_t cf8, uint8_t offset, uint8_t bytes);
-void pci_conf_write(uint32_t cf8, uint8_t offset, uint8_t bytes, uint32_t data);
-
 uint8_t pci_conf_read8(
     unsigned int bus, unsigned int dev, unsigned int func, unsigned int reg)
 {

diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c
index fe254bbbbd170fc151a8e84d959caa475c1ea84a..4723de8dc15ebe027b1ad46d393276df6e79b9fd 100644 (file)
--- a/xen/common/sysctl.c
+++ b/xen/common/sysctl.c
@@ -20,13 +20,12 @@
 #include <xen/guest_access.h>
 #include <xen/keyhandler.h>
 #include <asm/current.h>
+#include <xen/hypercall.h>
 #include <public/sysctl.h>
 #include <asm/numa.h>
 #include <xen/nodemask.h>
 #include <xsm/xsm.h>
-
-extern int do_get_pm_info(struct xen_sysctl_get_pmstat *op);
-extern int do_pm_op(struct xen_sysctl_pm_op *op);
+#include <xen/pmstat.h>
 
 extern long arch_do_sysctl(
     struct xen_sysctl *op, XEN_GUEST_HANDLE(xen_sysctl_t) u_sysctl);

diff --git a/xen/common/xenoprof.c b/xen/common/xenoprof.c
index 84e3437fa9450297ebdc4fe0f8b22e8e15667f92..ec29e1a1a0092c20b4827245c686676ed14c0a5e 100644 (file)
--- a/xen/common/xenoprof.c
+++ b/xen/common/xenoprof.c
@@ -16,6 +16,7 @@
 #include <public/xenoprof.h>
 #include <xen/paging.h>
 #include <xsm/xsm.h>
+#include <xen/hypercall.h>
 
 /* Limit amount of pages used for shared buffer (per domain) */
 #define MAX_OPROF_SHARED_PAGES 32

diff --git a/xen/drivers/acpi/pmstat.c b/xen/drivers/acpi/pmstat.c
index ad3623d5f2ad6859ea0bf303ed807b940a32dd82..be0f7fe743be62ab6cdc0152999c12d1f2723cde 100644 (file)
--- a/xen/drivers/acpi/pmstat.c
+++ b/xen/drivers/acpi/pmstat.c
@@ -41,13 +41,10 @@
 
 #include <public/sysctl.h>
 #include <acpi/cpufreq/cpufreq.h>
+#include <xen/pmstat.h>
 
 struct pm_px *__read_mostly cpufreq_statistic_data[NR_CPUS];
 
-extern uint32_t pmstat_get_cx_nr(uint32_t cpuid);
-extern int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat);
-extern int pmstat_reset_cx_stat(uint32_t cpuid);
-
 extern struct list_head cpufreq_governor_list;
 
 /*

diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c
index ca8b02d5c69c5cb2d8364cf7d46ea8dfd0ca468f..b7302217a97f61cf3a5923143ce7f753ea94c992 100644 (file)
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@ -34,6 +34,7 @@
 #include <asm/div64.h>
 #include <xsm/xsm.h>
 #include <public/sysctl.h>
+#include <xen/hypercall.h> /* for do_console_io */
 
 /* console: comma-separated list of console outputs. */
 static char __initdata opt_console[30] = OPT_CONSOLE_STR;

diff --git a/xen/drivers/passthrough/amd/iommu_detect.c b/xen/drivers/passthrough/amd/iommu_detect.c
index 8ffbbe275b53eccf4e94cbb817f421521a96e635..a98bef586cbb7390787996200bddbedd960e09c7 100644 (file)
--- a/xen/drivers/passthrough/amd/iommu_detect.c
+++ b/xen/drivers/passthrough/amd/iommu_detect.c
@@ -27,7 +27,6 @@
 #include <asm/hvm/svm/amd-iommu-proto.h>
 #include <asm/hvm/svm/amd-iommu-acpi.h>
 
-extern struct list_head amd_iommu_head;
 unsigned short last_bdf = 0;
 
 static int __init get_iommu_msi_capabilities(u8 bus, u8 dev, u8 func,

diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c b/xen/drivers/passthrough/amd/pci_amd_iommu.c
index 5d22289789ded605f7e7342c3932339640a32e33..ce50b751dc627ebaab82690b1ddca952c4e75324 100644 (file)
--- a/xen/drivers/passthrough/amd/pci_amd_iommu.c
+++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c
@@ -21,6 +21,7 @@
 #include <xen/sched.h>
 #include <xen/pci.h>
 #include <xen/pci_regs.h>
+#include <asm/hvm/iommu.h>
 #include <asm/amd-iommu.h>
 #include <asm/hvm/svm/amd-iommu-proto.h>
 

diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c
index 0d3c079799cf767945249923b2997f606aec8ede..b1ce67f7415a4e0c9b6975fe5a80b4171c4a19d4 100644 (file)
--- a/xen/drivers/passthrough/iommu.c
+++ b/xen/drivers/passthrough/iommu.c
@@ -21,8 +21,6 @@
 
 static void parse_iommu_param(char *s);
 static int iommu_populate_page_table(struct domain *d);
-int intel_vtd_setup(void);
-int amd_iov_detect(void);
 
 /*
  * The 'iommu' parameter enables the IOMMU.  Optional comma separated

diff --git a/xen/drivers/passthrough/vtd/dmar.c b/xen/drivers/passthrough/vtd/dmar.c
index 7f8dbb72fb3f5dfeed37d1c3cc3be5fc73d4f2c0..fb7acd879539cd1cdff7390b984daec16a459382 100644 (file)
--- a/xen/drivers/passthrough/vtd/dmar.c
+++ b/xen/drivers/passthrough/vtd/dmar.c
@@ -31,6 +31,7 @@
 #include <asm/string.h>
 #include "dmar.h"
 #include "iommu.h"
+#include "extern.h"
 
 #undef PREFIX
 #define PREFIX VTDPREFIX "ACPI DMAR:"

diff --git a/xen/drivers/passthrough/vtd/utils.c b/xen/drivers/passthrough/vtd/utils.c
index 68a04059d44a6d1e7e019b356a937df021639760..8edd102077053da37a0024058fb8053961543527 100644 (file)
--- a/xen/drivers/passthrough/vtd/utils.c
+++ b/xen/drivers/passthrough/vtd/utils.c
@@ -100,7 +100,7 @@ void print_iommu_regs(struct acpi_drhd_unit *drhd)
            dmar_readl(iommu->reg,DMAR_FEUADDR_REG));
 }
 
-u32 get_level_index(unsigned long gmfn, int level)
+static u32 get_level_index(unsigned long gmfn, int level)
 {
     while ( --level )
         gmfn = gmfn >> LEVEL_STRIDE;

diff --git a/xen/include/acpi/acglobal.h b/xen/include/acpi/acglobal.h
index 47a1fd8f2d8a2c61629efe6999fcda26613a94f0..feee603b0fe11489f66d3d9bd21f9e03c9258e5f 100644 (file)
--- a/xen/include/acpi/acglobal.h
+++ b/xen/include/acpi/acglobal.h
@@ -243,12 +243,16 @@ extern const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS];
 
 /* Exception codes */
 
+#ifndef DEFINE_ACPI_GLOBALS
+
 extern char const *acpi_gbl_exception_names_env[];
 extern char const *acpi_gbl_exception_names_pgm[];
 extern char const *acpi_gbl_exception_names_tbl[];
 extern char const *acpi_gbl_exception_names_aml[];
 extern char const *acpi_gbl_exception_names_ctrl[];
 
+#endif
+
 /*****************************************************************************
  *
  * Namespace globals

diff --git a/xen/include/acpi/platform/aclinux.h b/xen/include/acpi/platform/aclinux.h
index c54dbe39c6f0da37bd16ddaba19ea0012d53318b..805d8e57d1353f7b30f41e90035980815e7a5c21 100644 (file)
--- a/xen/include/acpi/platform/aclinux.h
+++ b/xen/include/acpi/platform/aclinux.h
@@ -76,11 +76,6 @@
 
 #define acpi_thread_id struct vcpu *
 
-static inline acpi_thread_id acpi_os_get_thread_id(void)
-{
-       return current;
-}
-
 #define ACPI_ALLOCATE(a)       xmalloc_bytes(a)
 #define ACPI_ALLOCATE_ZEROED(a)        ({              \
     void *p = xmalloc_bytes(a);                 \

diff --git a/xen/include/asm-x86/acpi.h b/xen/include/asm-x86/acpi.h
index b758095137138742fcccb061f1c627913153861f..b2bb9d986972ab1ab42aeeb2b11b1ba764cb6453 100644 (file)
--- a/xen/include/asm-x86/acpi.h
+++ b/xen/include/asm-x86/acpi.h
@@ -104,8 +104,6 @@ static inline void disable_acpi(void)
 /* Fixmap pages to reserve for ACPI boot-time tables (see fixmap.h) */
 #define FIX_ACPI_PAGES 4
 
-extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq);
-
 static inline void acpi_noirq_set(void) { acpi_noirq = 1; }
 static inline void acpi_disable_pci(void)
 {
@@ -116,6 +114,7 @@ static inline int acpi_irq_balance_set(char *str) { return 0; }
 
 /* routines for saving/restoring kernel state */
 extern int acpi_save_state_mem(void);
+extern int acpi_save_state_disk(void);
 extern void acpi_restore_state_mem(void);
 
 extern unsigned long acpi_wakeup_address;
@@ -131,16 +130,6 @@ extern int acpi_scan_nodes(u64 start, u64 end);
 
 #ifdef CONFIG_ACPI_SLEEP
 
-/* routines for saving/restoring kernel state */
-extern int acpi_save_state_mem(void);
-extern int acpi_save_state_disk(void);
-extern void acpi_restore_state_mem(void);
-
-extern unsigned long acpi_wakeup_address;
-
-/* early initialization routine */
-extern void acpi_reserve_bootmem(void);
-
 extern struct acpi_sleep_info acpi_sinfo;
 #define acpi_video_flags bootsym(video_flags)
 struct xenpf_enter_acpi_sleep;
@@ -170,4 +159,10 @@ void acpi_mmcfg_init(void);
 /* Incremented whenever we transition through S3. Value is 1 during boot. */
 extern uint32_t system_reset_counter;
 
+void hvm_acpi_power_button(struct domain *d);
+
+/* suspend/resume */
+void save_rest_processor_state(void);
+void restore_rest_processor_state(void);
+
 #endif /*__X86_ASM_ACPI_H*/

diff --git a/xen/include/asm-x86/amd-iommu.h b/xen/include/asm-x86/amd-iommu.h
index aebe7a8e6065ed40cf0032a2a07470fd92e6be73..5370d6b5a7d3257f7272caa1d299ea5c6ca4d109 100644 (file)
--- a/xen/include/asm-x86/amd-iommu.h
+++ b/xen/include/asm-x86/amd-iommu.h
@@ -30,8 +30,6 @@
 
 extern struct list_head amd_iommu_head;
 
-extern int __init amd_iov_detect(void);
-
 struct table_struct {
     void *buffer;
     unsigned long entries;

diff --git a/xen/include/asm-x86/bzimage.h b/xen/include/asm-x86/bzimage.h
new file mode 100644 (file)
index 0000000..31dacdf
--- /dev/null
+++ b/xen/include/asm-x86/bzimage.h
@@ -0,0 +1,12 @@
+#ifndef __X86_BZIMAGE_H__
+#define __X86_BZIMAGE_H__
+
+#include <xen/config.h>
+
+int __init bzimage_headroom(char *image_start, unsigned long image_length);
+
+int __init bzimage_parse(char *image_base,
+                       char **image_start,
+                       unsigned long *image_len);
+
+#endif /* __X86_BZIMAGE_H__ */

diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h
index 27f1f82507e7bed1c3c65e5172ba379690515727..2f045d50d402f8d637903f3ba4e492fc6dd358e4 100644 (file)
--- a/xen/include/asm-x86/domain.h
+++ b/xen/include/asm-x86/domain.h
@@ -456,6 +456,9 @@ int construct_dom0(
     unsigned long initrd_start, unsigned long initrd_len,
     char *cmdline);
 
+extern unsigned long initial_images_nrpages(void);
+extern void discard_initial_images(void);
+
 #endif /* __ASM_DOMAIN_H__ */
 
 /*

diff --git a/xen/include/asm-x86/hpet.h b/xen/include/asm-x86/hpet.h
index b0038e058e017b780a57f31b3302e811c07ae45c..da08880f6cb797e5a5acc6c716db7e97aa833c80 100644 (file)
--- a/xen/include/asm-x86/hpet.h
+++ b/xen/include/asm-x86/hpet.h
@@ -58,6 +58,8 @@
 #define hpet_write32(y,x) \
     (*(volatile u32 *)(fix_to_virt(FIX_HPET_BASE) + (x)) = (y))
 
+extern unsigned long hpet_address;
+
 /*
  * Detect and initialise HPET hardware: return counter update frequency.
  * Return value is zero if HPET is unavailable.

diff --git a/xen/include/asm-x86/hypercall.h b/xen/include/asm-x86/hypercall.h
index 508cce6191d5023a0f98ab99bec4c9bd1f06f51d..fc7ccc0be53c2df84727663ecda274fa3e898cfd 100644 (file)
--- a/xen/include/asm-x86/hypercall.h
+++ b/xen/include/asm-x86/hypercall.h
@@ -6,6 +6,8 @@
 #define __ASM_X86_HYPERCALL_H__
 
 #include <public/physdev.h>
+#include <public/arch-x86/xen-mca.h> /* for do_mca */
+#include <public/domctl.h> /* for arch_do_domctl */
 #include <xen/types.h>
 
 /*
@@ -28,10 +30,6 @@ extern long
 do_event_channel_op_compat(
     XEN_GUEST_HANDLE(evtchn_op_t) uop);
 
-extern long
-do_physdev_op_compat(
-    XEN_GUEST_HANDLE(physdev_op_t) uop);
-
 extern long
 do_set_trap_table(
     XEN_GUEST_HANDLE(const_trap_info_t) traps);
@@ -71,6 +69,9 @@ do_update_descriptor(
     u64 pa,
     u64 desc);
 
+extern long
+do_mca(XEN_GUEST_HANDLE(xen_mc_t) u_xen_mc);
+
 extern int
 do_update_va_mapping(
     unsigned long va,
@@ -104,6 +105,11 @@ extern long
 arch_do_vcpu_op(
     int cmd, struct vcpu *v, XEN_GUEST_HANDLE(void) arg);
 
+extern long
+arch_do_domctl(
+    struct xen_domctl *domctl,
+    XEN_GUEST_HANDLE(xen_domctl_t) u_domctl);
+
 extern int
 do_kexec(
     unsigned long op, unsigned arg1, XEN_GUEST_HANDLE(void) uarg);

diff --git a/xen/include/asm-x86/io_apic.h b/xen/include/asm-x86/io_apic.h
index c5d212c0a35042d7b88bed2a54922a6ac1ca9d01..e064d4a7d5d3423b6cc0d460cbcb41a57a5d0071 100644 (file)
--- a/xen/include/asm-x86/io_apic.h
+++ b/xen/include/asm-x86/io_apic.h
@@ -119,15 +119,6 @@ struct IO_APIC_route_entry {
 /* I/O APIC entries */
 extern struct mpc_config_ioapic mp_ioapics[MAX_IO_APICS];
 
-/* # of MP IRQ source entries */
-extern int mp_irq_entries;
-
-/* MP IRQ source entries */
-extern struct mpc_config_intsrc mp_irqs[MAX_IRQ_SOURCES];
-
-/* non-0 if default (table-less) MP configuration */
-extern int mpc_default_type;
-
 /* Only need to remap ioapic RTE (reg: 10~3Fh) */
 #define ioapic_reg_remapped(reg) (iommu_enabled && ((reg) >= 0x10))
 

diff --git a/xen/include/asm-x86/irq.h b/xen/include/asm-x86/irq.h
index 7a1c0e9d9b7e3d73ae3585c2062fb42bee943897..c4fbaeb58d7e32bf464c68bac0482c65bb09531d 100644 (file)
--- a/xen/include/asm-x86/irq.h
+++ b/xen/include/asm-x86/irq.h
@@ -76,6 +76,19 @@ fastcall void thermal_interrupt(void);
 fastcall void cmci_interrupt(void);
 fastcall void irq_move_cleanup_interrupt(void);
 
+fastcall void smp_event_check_interrupt(struct cpu_user_regs *regs);
+fastcall void smp_invalidate_interrupt(void);
+fastcall void smp_call_function_interrupt(struct cpu_user_regs *regs);
+fastcall void smp_apic_timer_interrupt(struct cpu_user_regs *regs);
+fastcall void smp_error_interrupt(struct cpu_user_regs *regs);
+fastcall void smp_pmu_apic_interrupt(struct cpu_user_regs *regs);
+fastcall void smp_spurious_interrupt(struct cpu_user_regs *regs);
+fastcall void smp_thermal_interrupt(struct cpu_user_regs *regs);
+fastcall void smp_cmci_interrupt(struct cpu_user_regs *regs);
+fastcall void smp_irq_move_cleanup_interrupt(struct cpu_user_regs *regs);
+
+asmlinkage void do_IRQ(struct cpu_user_regs *regs);
+
 void disable_8259A_irq(unsigned int irq);
 void enable_8259A_irq(unsigned int irq);
 int i8259A_irq_pending(unsigned int irq);

diff --git a/xen/include/asm-x86/mach-generic/mach_apic.h b/xen/include/asm-x86/mach-generic/mach_apic.h
index db845bd501b2dee280dfbf7f63aac9c33527d1db..a453a08a94c392367d6bec0e3ac37c7fc1fbade9 100644 (file)
--- a/xen/include/asm-x86/mach-generic/mach_apic.h
+++ b/xen/include/asm-x86/mach-generic/mach_apic.h
@@ -53,6 +53,7 @@ static inline int multi_timer_check(int apic, int irq)
        return 0;
 }
 
+extern void generic_apic_probe(void);
 extern void generic_bigsmp_probe(void);
 
 /*

diff --git a/xen/include/asm-x86/mpspec.h b/xen/include/asm-x86/mpspec.h
index e495b74102ecd924f75d9fc6a901fff14383fb90..72aaf95b0a97f8e9599ea13c6ceb199c0b9950fb 100644 (file)
--- a/xen/include/asm-x86/mpspec.h
+++ b/xen/include/asm-x86/mpspec.h
@@ -16,13 +16,10 @@ extern unsigned int boot_cpu_physical_apicid;
 extern int smp_found_config;
 extern void find_smp_config (void);
 extern void get_smp_config (void);
-extern int nr_ioapics;
 extern int apic_version [MAX_APICS];
-extern int mp_bus_id_to_type [MAX_MP_BUSSES];
 extern int mp_irq_entries;
 extern struct mpc_config_intsrc mp_irqs [MAX_IRQ_SOURCES];
 extern int mpc_default_type;
-extern int mp_bus_id_to_pci_bus [MAX_MP_BUSSES];
 extern unsigned long mp_lapic_addr;
 extern int pic_mode;
 extern int using_apic_timer;

diff --git a/xen/include/asm-x86/mtrr.h b/xen/include/asm-x86/mtrr.h
index e12c8d322ad2e65bb66437ecbe4db32c0cecf853..93bfb7ffcd28bce478d4f30534a587323c14244e 100644 (file)
--- a/xen/include/asm-x86/mtrr.h
+++ b/xen/include/asm-x86/mtrr.h
@@ -76,4 +76,14 @@ extern void mtrr_aps_sync_begin(void);
 extern void mtrr_aps_sync_end(void);
 extern void mtrr_bp_restore(void);
 
+extern bool_t mtrr_var_range_msr_set(struct mtrr_state *v,
+                               uint32_t msr, uint64_t msr_content);
+extern bool_t mtrr_fix_range_msr_set(struct mtrr_state *v,
+                               uint32_t row, uint64_t msr_content);
+extern bool_t mtrr_def_type_msr_set(struct mtrr_state *v, uint64_t msr_content);
+extern bool_t pat_msr_set(uint64_t *pat, uint64_t msr);
+
+bool_t is_var_mtrr_overlapped(struct mtrr_state *m);
+bool_t mtrr_pat_not_equal(struct vcpu *vd, struct vcpu *vs);
+
 #endif /* __ASM_X86_MTRR_H__ */

diff --git a/xen/include/asm-x86/setup.h b/xen/include/asm-x86/setup.h
new file mode 100644 (file)
index 0000000..c6b6ea5
--- /dev/null
+++ b/xen/include/asm-x86/setup.h
@@ -0,0 +1,29 @@
+#ifndef __X86_SETUP_H_
+#define __X86_SETUP_H_
+
+extern int early_boot;
+extern unsigned long xenheap_initial_phys_start;
+
+void init_done(void);
+
+void early_cpu_init(void);
+void early_time_init(void);
+void early_page_fault(void);
+
+int intel_cpu_init(void);
+int amd_init_cpu(void);
+int cyrix_init_cpu(void);
+int nsc_init_cpu(void);
+int centaur_init_cpu(void);
+int transmeta_init_cpu(void);
+
+void numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn);
+void arch_init_memory(void);
+void subarch_init_memory(void);
+
+void init_IRQ(void);
+void init_tmem(void);
+void vesa_init(void);
+void vesa_mtrr_init(void);
+
+#endif

diff --git a/xen/include/asm-x86/smp.h b/xen/include/asm-x86/smp.h
index 8cd15e2efb3509bcf91fcebf867cfb1e37cccfba..f94794930e36f5896fe6db1e10914a50d23fc8a7 100644 (file)
--- a/xen/include/asm-x86/smp.h
+++ b/xen/include/asm-x86/smp.h
@@ -31,7 +31,6 @@
  */
  
 extern void smp_alloc_memory(void);
-extern int pic_mode;
 DECLARE_PER_CPU(cpumask_t, cpu_sibling_map);
 DECLARE_PER_CPU(cpumask_t, cpu_core_map);
 
@@ -81,7 +80,7 @@ static inline void enable_nonboot_cpus(void) {}
 
 extern cpumask_t cpu_callout_map;
 extern cpumask_t cpu_callin_map;
-extern cpumask_t cpu_possible_map;
+/* cpu_possible_map declared in <xen/cpumask.h> */
 
 /* We don't mark CPUs online until __cpu_up(), so we need another measure */
 static inline int num_booting_cpus(void)

diff --git a/xen/include/asm-x86/x86_32/asm_defns.h b/xen/include/asm-x86/x86_32/asm_defns.h
index 6bf7e2c619753938a10b773159dae06389bfe7d8..bbdd55efce52e386ba4b124a4c41f0a67646ed9e 100644 (file)
--- a/xen/include/asm-x86/x86_32/asm_defns.h
+++ b/xen/include/asm-x86/x86_32/asm_defns.h
@@ -106,7 +106,6 @@
 
 #define BUILD_SMP_INTERRUPT(x,v) XBUILD_SMP_INTERRUPT(x,v)
 #define XBUILD_SMP_INTERRUPT(x,v)               \
-asmlinkage void x(void);                        \
 __asm__(                                        \
     "\n"__ALIGN_STR"\n"                         \
     ".globl " STR(x) "\n\t"                     \

diff --git a/xen/include/asm-x86/x86_64/asm_defns.h b/xen/include/asm-x86/x86_64/asm_defns.h
index e576e0315a9824a2a3a07c30f3ca8857704df749..328c5263aa5628479607ea68afa680e32be07366 100644 (file)
--- a/xen/include/asm-x86/x86_64/asm_defns.h
+++ b/xen/include/asm-x86/x86_64/asm_defns.h
@@ -89,7 +89,6 @@
 
 #define BUILD_SMP_INTERRUPT(x,v) XBUILD_SMP_INTERRUPT(x,v)
 #define XBUILD_SMP_INTERRUPT(x,v)               \
-asmlinkage void x(void);                        \
 __asm__(                                        \
     "\n"__ALIGN_STR"\n"                         \
     ".globl " STR(x) "\n\t"                     \

diff --git a/xen/include/asm-x86/x86_64/page.h b/xen/include/asm-x86/x86_64/page.h
index 78a79c59e3001ec4f7ffcb82c1c8e63511055947..f1448c12a884aa7513db2d69655ed063aeac203b 100644 (file)
--- a/xen/include/asm-x86/x86_64/page.h
+++ b/xen/include/asm-x86/x86_64/page.h
@@ -32,9 +32,6 @@
 #include <xen/config.h>
 #include <asm/types.h>
 
-/* Physical address where Xen was relocated to. */
-extern unsigned long xen_phys_start;
-
 extern unsigned long max_pdx;
 extern unsigned long pfn_pdx_bottom_mask, ma_va_bottom_mask;
 extern unsigned int pfn_pdx_hole_shift;

diff --git a/xen/include/xen/cpuidle.h b/xen/include/xen/cpuidle.h
index 559db769dcd234244a968d3fd11cbf39905330b7..edf1ce6fb2f495f6aed33ef7f4fda227ca60a9dd 100644 (file)
--- a/xen/include/xen/cpuidle.h
+++ b/xen/include/xen/cpuidle.h
@@ -84,5 +84,6 @@ struct cpuidle_governor
 };
 
 extern struct cpuidle_governor *cpuidle_current_governor;
+void cpuidle_disable_deep_cstate(void);
 
 #endif /* _XEN_CPUIDLE_H */

diff --git a/xen/include/xen/hypercall.h b/xen/include/xen/hypercall.h
index 5d151226e9833b15ac2475e43d75f0b3ea446596..3e1ada4bc91e113c66102f16b58287b4c08c67ad 100644 (file)
--- a/xen/include/xen/hypercall.h
+++ b/xen/include/xen/hypercall.h
@@ -121,6 +121,9 @@ extern long
 do_tmem_op(
     XEN_GUEST_HANDLE(tmem_op_t) uops);
 
+extern int
+do_xenoprof_op(int op, XEN_GUEST_HANDLE(void) arg);
+
 #ifdef CONFIG_COMPAT
 
 extern int
@@ -140,6 +143,9 @@ compat_vcpu_op(
     int vcpuid,
     XEN_GUEST_HANDLE(void) arg);
 
+extern int
+compat_xenoprof_op(int op, XEN_GUEST_HANDLE(void) arg);
+
 #endif
 
 #endif /* __XEN_HYPERCALL_H__ */

diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h
index f98756a495d278f0b92b0baa1e066279efac6f3f..bf81b6b8db82acd9f410a29b9e3b8f78b452489e 100644 (file)
--- a/xen/include/xen/irq.h
+++ b/xen/include/xen/irq.h
@@ -120,8 +120,6 @@ struct irq_cfg {
 extern struct irq_cfg irq_cfg[];
 
 #else
-extern struct irq_desc *irq_desc;
-
 extern int setup_irq(unsigned int irq, struct irqaction *);
 extern void release_irq(unsigned int irq);
 extern int request_irq(unsigned int irq,

diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h
index 32ec850a1c14ac953d5d54e37337d34ec2dace39..abb8584ed3912bc75f5eed4b8fa1f2978e3ca0c4 100644 (file)
--- a/xen/include/xen/pci.h
+++ b/xen/include/xen/pci.h
@@ -104,6 +104,8 @@ void pci_conf_write16(
 void pci_conf_write32(
     unsigned int bus, unsigned int dev, unsigned int func, unsigned int reg,
     uint32_t data);
+uint32_t pci_conf_read(uint32_t cf8, uint8_t offset, uint8_t bytes);
+void pci_conf_write(uint32_t cf8, uint8_t offset, uint8_t bytes, uint32_t data);
 int pci_mmcfg_read(unsigned int seg, unsigned int bus,
                    unsigned int devfn, int reg, int len, u32 *value);
 int pci_mmcfg_write(unsigned int seg, unsigned int bus,

diff --git a/xen/include/xen/pmstat.h b/xen/include/xen/pmstat.h
new file mode 100644 (file)
index 0000000..979af23
--- /dev/null
+++ b/xen/include/xen/pmstat.h
@@ -0,0 +1,16 @@
+#ifndef __XEN_PMSTAT_H_
+#define __XEN_PMSTAT_H_
+
+#include <xen/types.h>
+#include <public/platform.h> /* for struct xen_processor_power */
+#include <public/sysctl.h>   /* for struct pm_cx_stat */
+
+long set_cx_pminfo(uint32_t cpu, struct xen_processor_power *power);
+uint32_t pmstat_get_cx_nr(uint32_t cpuid);
+int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat);
+int pmstat_reset_cx_stat(uint32_t cpuid);
+
+int do_get_pm_info(struct xen_sysctl_get_pmstat *op);
+int do_pm_op(struct xen_sysctl_pm_op *op);
+
+#endif /* __XEN_PMSTAT_H_ */

diff --git a/xen/include/xen/xenoprof.h b/xen/include/xen/xenoprof.h
index 9d760eb59a506f379804255572388e542ff66d60..5b38e614da5cc3865da1ec782629c016344552c8 100644 (file)
--- a/xen/include/xen/xenoprof.h
+++ b/xen/include/xen/xenoprof.h
@@ -64,10 +64,10 @@ struct xenoprof {
 #endif
 
 struct domain;
+int is_active(struct domain *d);
 int is_passive(struct domain *d);
 void free_xenoprof_pages(struct domain *d);
 
-int do_xenoprof_op(int op, XEN_GUEST_HANDLE(void) arg);
 int xenoprof_add_trace(struct domain *d, struct vcpu *v, 
                        unsigned long eip, int mode);
 
@@ -77,4 +77,8 @@ int xenoprof_add_trace(struct domain *d, struct vcpu *v,
 int acquire_pmu_ownship(int pmu_ownership);
 void release_pmu_ownship(int pmu_ownership);
 
+void xenoprof_log_event(struct vcpu *vcpu,
+                        struct cpu_user_regs * regs, unsigned long eip,
+                        int mode, int event);
+
 #endif  /* __XEN__XENOPROF_H__ */

diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h
index 6d45efd0e2bf90d0ba5628385da6071b08e7e0ba..387f93e9ea2a21586a7fb35c4a28b81e0ad2387b 100644 (file)
--- a/xen/include/xsm/xsm.h
+++ b/xen/include/xsm/xsm.h
@@ -21,8 +21,6 @@
 typedef void xsm_op_t;
 DEFINE_XEN_GUEST_HANDLE(xsm_op_t);
 
-extern long do_xsm_op (XEN_GUEST_HANDLE(xsm_op_t) op);
-
 #ifdef XSM_ENABLE
     #define xsm_call(fn) xsm_ops->fn
 #else

diff --git a/xen/xsm/xsm_core.c b/xen/xsm/xsm_core.c
index d572f997c07df384dc1bf1aa3e8c1c7e9187c8fa..e55f25b5d985fb50cfbdccb5bbb06c75c0e0e131 100644 (file)
--- a/xen/xsm/xsm_core.c
+++ b/xen/xsm/xsm_core.c
@@ -14,6 +14,7 @@
 #include <xen/errno.h>
 #include <xen/lib.h>
 
+#include <xen/hypercall.h>
 #include <xsm/xsm.h>
 
 #ifdef XSM_ENABLE

diff --git a/xen/xsm/xsm_policy.c b/xen/xsm/xsm_policy.c
index 2919c1a6996caf0bcd2d2ef5adeecd89d4a75ce5..f1e8bd27ceb63b43188eaec80070501cc595ae21 100644 (file)
--- a/xen/xsm/xsm_policy.c
+++ b/xen/xsm/xsm_policy.c
@@ -19,6 +19,7 @@
  *
  */
 
+#define XSM_ENABLE
 #include <xsm/xsm.h>
 #include <xen/multiboot.h>